Adwaita: some separators simplification

Accidentally fixing the backdrop separators in sidebars turning
black

diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index 44428fcf773e4b416d9191d74899869efaa60952..a3812151a8eaa629288515e86b3a40ede36c928b 100644 (file)
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -971,7 +971,7 @@ GtkComboBox {
   }
 }
 
-// the followind is for spacing the icon and the label inside the home button
+// the following is for spacing the icon and the label inside the home button
 .path-bar .button GtkLabel:last-child { padding-left: 2px; }
 .path-bar .button GtkLabel:first-child { padding-right: 2px; }
 .path-bar .button GtkLabel:only-child { padding-right: 0; padding-left: 0; }
@@ -1184,15 +1184,14 @@ GtkTreeView.view.progressbar { //Progressbar in treeview cells
     border-style: none;
     background-color: transparent;
   }
-  .separator {
-    font-size: 80%;
-    font-weight: bold;
-    color: mix($fg_color, $bg_color, 20%);
-    text-shadow: none;
-    background-color: transparent;
-    icon-shadow: none;
-    border: 0;
-  }
+//  .separator {                         Those props doesn't seem to do anything
+//    font-size: 80%;                    I'll comment these out for now and I'll
+//    font-weight: bold;                 delete if nobody blames me :-)
+//    text-shadow: none;
+//    background-color: transparent;
+//    icon-shadow: none;
+//    border: 0;
+//  }
   .button.flat,
   .button.flat:hover {
     text-shadow: none;
@@ -2339,9 +2338,7 @@ GtkFileChooserDialog {
   &:selected {
     background-color: $selected_bg_color;
   }
- .separator {
-    color: mix($_sidebar_bg,$borders_color,70%);
-  }
+  .separator:backdrop { @extend .separator; } // overriden w/o this
 }
 
 GtkPaned {

diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 251bb01257e5d59fafcfb3afb69b489555143e47..288742ff9d56b8b2773295e77f0e9af71edf309d 100644 (file)
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -895,7 +895,9 @@ GtkComboBox {
     color: #5d6767; }
   GtkComboBox .menuitem {
     text-shadow: none; }
-  GtkComboBox .separator {
+  GtkComboBox .separator, GtkComboBox .sidebar .separator:backdrop, .sidebar GtkComboBox .separator:backdrop,
+  GtkComboBox .sidebar .view .separator:backdrop,
+  .sidebar .view GtkComboBox .separator:backdrop {
     -GtkWidget-wide-separators: true;
     -GtkWidget-horizontal-separator: 0;
     -GtkWidget-vertical-separator: 0; }
@@ -959,8 +961,11 @@ GtkComboBox {
     font-size: 80%;
     padding: 0 12px; }
   .titlebar .header-bar-separator, GtkCalendar.header .header-bar-separator, .titlebar > GtkBox > .separator.vertical, GtkCalendar.header > GtkBox > .separator.vertical,
+  .sidebar .view .titlebar > GtkBox > .vertical.separator:backdrop,
+  .sidebar .view GtkCalendar.header > GtkBox > .vertical.separator:backdrop,
   .header-bar .header-bar-separator,
-  .header-bar > GtkBox > .separator.vertical {
+  .header-bar > GtkBox > .separator.vertical,
+  .sidebar .view .header-bar > GtkBox > .vertical.separator:backdrop {
     -GtkWidget-wide-separators: true;
     -GtkWidget-separator-width: 1px;
     border-width: 0 1px;
@@ -1299,14 +1304,6 @@ GtkTreeView.view.progressbar {
   .popover.osd > .search-bar {
     border-style: none;
     background-color: transparent; }
-  .popover .separator {
-    font-size: 80%;
-    font-weight: bold;
-    color: #5d6261;
-    text-shadow: none;
-    background-color: transparent;
-    icon-shadow: none;
-    border: 0; }
   .popover .button.flat,
   .popover .button.flat:hover {
     text-shadow: none;
@@ -2477,9 +2474,14 @@ GtkScrolledWindow .frame {
 GtkScrolledWindow GtkViewport.frame {
   border-style: none; }
 
-.separator {
+.separator, .sidebar .separator:backdrop,
+.sidebar .view .separator:backdrop {
   color: rgba(0, 0, 0, 0.1); }
-  GtkFileChooserButton .separator, GtkFontButton .separator {
+  GtkFileChooserButton .separator, GtkFileChooserButton .sidebar .separator:backdrop, .sidebar GtkFileChooserButton .separator:backdrop,
+  GtkFileChooserButton .sidebar .view .separator:backdrop,
+  .sidebar .view GtkFileChooserButton .separator:backdrop, GtkFontButton .separator, GtkFontButton .sidebar .separator:backdrop, .sidebar GtkFontButton .separator:backdrop,
+  GtkFontButton .sidebar .view .separator:backdrop,
+  .sidebar .view GtkFontButton .separator:backdrop {
     -GtkWidget-wide-separators: true;
     -GtkWidget-horizontal-separator: 0;
     -GtkWidget-vertical-separator: 0; }
@@ -2786,9 +2788,6 @@ GtkFileChooserDialog .dialog-action-box {
   .sidebar:selected,
   .sidebar .view:selected {
     background-color: #215d9c; }
-  .sidebar .separator,
-  .sidebar .view .separator {
-    color: #383e3e; }
 
 GtkPaned {
   margin: 0 8px 8px 0; }

diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index 8726da6c8df10ecfb4b9b0ac07b2e74da5470bf4..955b813efc2868f854ed9b4fd47ad13a7fc33f23 100644 (file)
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -887,7 +887,9 @@ GtkComboBox {
     color: #c7c7c7; }
   GtkComboBox .menuitem {
     text-shadow: none; }
-  GtkComboBox .separator {
+  GtkComboBox .separator, GtkComboBox .sidebar .separator:backdrop, .sidebar GtkComboBox .separator:backdrop,
+  GtkComboBox .sidebar .view .separator:backdrop,
+  .sidebar .view GtkComboBox .separator:backdrop {
     -GtkWidget-wide-separators: true;
     -GtkWidget-horizontal-separator: 0;
     -GtkWidget-vertical-separator: 0; }
@@ -951,8 +953,11 @@ GtkComboBox {
     font-size: 80%;
     padding: 0 12px; }
   .titlebar .header-bar-separator, GtkCalendar.header .header-bar-separator, .titlebar > GtkBox > .separator.vertical, GtkCalendar.header > GtkBox > .separator.vertical,
+  .sidebar .view .titlebar > GtkBox > .vertical.separator:backdrop,
+  .sidebar .view GtkCalendar.header > GtkBox > .vertical.separator:backdrop,
   .header-bar .header-bar-separator,
-  .header-bar > GtkBox > .separator.vertical {
+  .header-bar > GtkBox > .separator.vertical,
+  .sidebar .view .header-bar > GtkBox > .vertical.separator:backdrop {
     -GtkWidget-wide-separators: true;
     -GtkWidget-separator-width: 1px;
     border-width: 0 1px;
@@ -1293,14 +1298,6 @@ GtkTreeView.view.progressbar {
   .popover.osd > .search-bar {
     border-style: none;
     background-color: transparent; }
-  .popover .separator {
-    font-size: 80%;
-    font-weight: bold;
-    color: #c6c8c8;
-    text-shadow: none;
-    background-color: transparent;
-    icon-shadow: none;
-    border: 0; }
   .popover .button.flat,
   .popover .button.flat:hover {
     text-shadow: none;
@@ -2473,9 +2470,14 @@ GtkScrolledWindow .frame {
 GtkScrolledWindow GtkViewport.frame {
   border-style: none; }
 
-.separator {
+.separator, .sidebar .separator:backdrop,
+.sidebar .view .separator:backdrop {
   color: rgba(0, 0, 0, 0.1); }
-  GtkFileChooserButton .separator, GtkFontButton .separator {
+  GtkFileChooserButton .separator, GtkFileChooserButton .sidebar .separator:backdrop, .sidebar GtkFileChooserButton .separator:backdrop,
+  GtkFileChooserButton .sidebar .view .separator:backdrop,
+  .sidebar .view GtkFileChooserButton .separator:backdrop, GtkFontButton .separator, GtkFontButton .sidebar .separator:backdrop, .sidebar GtkFontButton .separator:backdrop,
+  GtkFontButton .sidebar .view .separator:backdrop,
+  .sidebar .view GtkFontButton .separator:backdrop {
     -GtkWidget-wide-separators: true;
     -GtkWidget-horizontal-separator: 0;
     -GtkWidget-vertical-separator: 0; }
@@ -2782,9 +2784,6 @@ GtkFileChooserDialog .dialog-action-box {
   .sidebar:selected,
   .sidebar .view:selected {
     background-color: #4a90d9; }
-  .sidebar .separator,
-  .sidebar .view .separator {
-    color: #dfdfdf; }
 
 GtkPaned {
   margin: 0 8px 8px 0; }